feat(auto-merge): create auto merge action MAPCO-9003 by michalby24 · Pull Request #104 · MapColonies/shared-workflows

michalby24 · 2025-12-11T09:17:06Z

This pull request introduces a new GitHub Action for automatically merging pull requests that have the auto-merge label, and sets up workflow and release configuration for it. The action checks for the label, waits for required checks to pass, and merges the PR if conditions are met.
example: https://github.com/MapColonies/test-site/pull/60/ and here

…e' label

…ion process

…label check logic

…checks

…rkflows into auto-merge

netanelC

Always look for ready-to-use actions before you implement one. There is already an open-source action for that 👀

michalby24 · 2025-12-14T13:33:37Z

Always look for ready-to-use actions before you implement one. There is already an open-source action for that 👀

I looked into switching to pascalgn/automerge-action as suggested.
The main issue is that it does not wait for all checks by itself.

Per its own documentation:

“When the pull request is ready, it will automatically be merged. The action will only wait for status checks that are marked as required in the branch protection rules.”
https://github.com/pascalgn/automerge-action#how-it-works

In our current setup, this isn’t enforceable because branch rulesets are not applied to private repositories on our plan:

As a result, the action can merge PRs before CI finishes, which we already observed.

My custom action explicitly waits for all PR checks to complete successfully inside the action itself, so it behaves correctly regardless of branch protection or plan limitations.

actions/auto-merge/action.yaml

netanelC · 2025-12-15T13:31:40Z

Always look for ready-to-use actions before you implement one. There is already an open-source action for that 👀

I looked into switching to pascalgn/automerge-action as suggested. The main issue is that it does not wait for all checks by itself.

Per its own documentation:

“When the pull request is ready, it will automatically be merged. The action will only wait for status checks that are marked as required in the branch protection rules.” https://github.com/pascalgn/automerge-action#how-it-works

In our current setup, this isn’t enforceable because branch rulesets are not applied to private repositories on our plan:
As a result, the action can merge PRs before CI finishes, which we already observed.
My custom action explicitly waits for all PR checks to complete successfully inside the action itself, so it behaves correctly regardless of branch protection or plan limitations.

So you can separate to 2 steps: validating and merging. No need to implement the merge action (or the validatation stage in case this action does the job)

alex131290 · 2025-12-15T14:36:18Z

Always look for ready-to-use actions before you implement one. There is already an open-source action for that 👀

@michalby24 @netanelC this action is being maintained anymore, the last commit was over 1 year ago, i don't feel comfortable using such an old open source code

netanelC · 2025-12-18T08:30:39Z

Always look for ready-to-use actions before you implement one. There is already an open-source action for that 👀

@michalby24 @netanelC this action is being maintained anymore, the last commit was over 1 year ago, i don't feel comfortable using such an old open source code

Too bad.. It seems like a good action

ronenkapelian · 2025-12-31T10:52:11Z

should add auto-merge action also to .release-please-manifest.json

ronenkapelian

one comment about the release-please-manifest,

The test-auto-merge validating the "easy" flow when its not auto-merged, what about the intersting flow, when its true? any way to test it?

…orkflow

…rge workflow

…ge workflow

michsi24 and others added 10 commits December 9, 2025 09:24

ci(auto-merge): add action to automatically merge PRs with 'auto-merg…

0482082

…e' label

ci: update action to include repository input and enhance authenticat…

92b0d19

…ion process

ci(auto-merge): update workflow to use dynamic PR number and improve …

361a38b

…label check logic

ci(auto-merge): refine installation and authentication steps for gh

51bb00d

ci(auto-merge): wait for required checks to pass before merging PRs

6b301bb

feat(auto-merge): add auto-merge action for labeled PRs with passing …

4b1c8f5

…checks

Merge branch 'master' into auto-merge

e0cd093

ci(auto-merge): update test workflow to use dynamic repository input

7ae4a68

Merge branch 'auto-merge' of https://github.com/MapColonies/shared-wo…

967c805

…rkflows into auto-merge

docs(auto-merge): add README for auto-merge

d6da8a4

netanelC requested changes Dec 11, 2025

View reviewed changes